Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 11 Jan 2010 22:07:25 +0000 (22:07 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 11 Jan 2010 22:07:25 +0000 (22:07 +0000)

Trivial merge